From: Keir Fraser Date: Wed, 5 Nov 2008 10:25:11 +0000 (+0000) Subject: x86, hvm: Only warn on memory attribute conflicts for real RAM. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14043^2~55 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f154ddb585372be0878dbdad494ac8454dc4cb2e;p=xen.git x86, hvm: Only warn on memory attribute conflicts for real RAM. From: Disheng Su Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 77f31a6f7f..7344576f16 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -392,12 +392,13 @@ uint32_t get_pat_flags(struct vcpu *v, */ if ( pat_entry_value == INVALID_MEM_TYPE ) { - gdprintk(XENLOG_WARNING, - "Conflict occurs for a given guest l1e flags:%x " - "at %"PRIx64" (the effective mm type:%d), " - "because the host mtrr type is:%d\n", - gl1e_flags, (uint64_t)gpaddr, guest_eff_mm_type, - shadow_mtrr_type); + if (mfn_valid(paddr_to_pfn(spaddr))) + gdprintk(XENLOG_WARNING, + "Conflict occurs for a given guest l1e flags:%x " + "at %"PRIx64" (the effective mm type:%d), " + "because the host mtrr type is:%d\n", + gl1e_flags, (uint64_t)gpaddr, guest_eff_mm_type, + shadow_mtrr_type); pat_entry_value = PAT_TYPE_UNCACHABLE; } /* 4. Get the pte flags */